From 889870546f4d1c520dd6f96a0f3e14dfcaca0067 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Wed, 29 Mar 2023 06:41:23 +0200
Subject: [PATCH] filechoosercell: Remove position property

Instead, query the position from the listitem
---
 gtk/gtkfilechoosercell.c       | 19 +++----------------
 gtk/ui/gtkfilechooserwidget.ui | 18 ------------------
 2 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/gtk/gtkfilechoosercell.c b/gtk/gtkfilechoosercell.c
index ec8079ef64..3787b7f8b4 100644
--- a/gtk/gtkfilechoosercell.c
+++ b/gtk/gtkfilechoosercell.c
@@ -38,7 +38,6 @@ struct _GtkFileChooserCell
   GtkWidget parent_instance;
 
   GFileInfo *item;
-  guint position;
   GtkListItem *list_item;
 
   gboolean show_time;
@@ -78,8 +77,9 @@ popup_menu (GtkFileChooserCell *self,
                                  &GRAPHENE_POINT_INIT (x, y), &p))
     return;
 
-  gtk_widget_activate_action (widget, "item.popup-file-list-menu",
-                              "(udd)", self->position, p.x, p.y);
+  if (self->list_item)
+    gtk_widget_activate_action (widget, "item.popup-file-list-menu",
+                                "(udd)", gtk_list_item_get_position (self->list_item), p.x, p.y);
 }
 
 static void
@@ -222,10 +222,6 @@ gtk_file_chooser_cell_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_POSITION:
-      self->position = g_value_get_uint (value);
-      break;
-
     case PROP_ITEM:
       self->item = g_value_get_object (value);
 
@@ -263,10 +259,6 @@ gtk_file_chooser_cell_get_property (GObject    *object,
 
   switch (prop_id)
     {
-    case PROP_POSITION:
-      g_value_set_uint (value, self->position);
-      break;
-
     case PROP_ITEM:
       g_value_set_object (value, self->item);
       break;
@@ -292,11 +284,6 @@ gtk_file_chooser_cell_class_init (GtkFileChooserCellClass *klass)
   object_class->set_property = gtk_file_chooser_cell_set_property;
   object_class->get_property = gtk_file_chooser_cell_get_property;
 
-  g_object_class_install_property (object_class, PROP_POSITION,
-                                   g_param_spec_uint ("position", NULL, NULL,
-                                                      0, G_MAXUINT, 0,
-                                                      GTK_PARAM_READWRITE));
-
   g_object_class_install_property (object_class, PROP_ITEM,
                                    g_param_spec_object ("item", NULL, NULL,
                                                         G_TYPE_FILE_INFO,
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index 467a92cf82..41f03a6def 100644
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -184,9 +184,6 @@
   <template class="GtkListItem">
     <property name="child">
       <object class="GtkFileChooserCell">
-        <binding name="position">
-          <lookup name="position">GtkListItem</lookup>
-        </binding>
         <binding name="item">
           <lookup name="item">GtkListItem</lookup>
         </binding>
@@ -245,9 +242,6 @@
   <template class="GtkListItem">
     <property name="child">
       <object class="GtkFileChooserCell">
-        <binding name="position">
-          <lookup name="position">GtkListItem</lookup>
-        </binding>
         <binding name="item">
           <lookup name="item">GtkListItem</lookup>
         </binding>
@@ -292,9 +286,6 @@
   <template class="GtkListItem">
     <property name="child">
       <object class="GtkFileChooserCell">
-        <binding name="position">
-          <lookup name="position">GtkListItem</lookup>
-        </binding>
         <binding name="item">
           <lookup name="item">GtkListItem</lookup>
         </binding>
@@ -337,9 +328,6 @@
   <template class="GtkListItem">
     <property name="child">
       <object class="GtkFileChooserCell">
-        <binding name="position">
-          <lookup name="position">GtkListItem</lookup>
-        </binding>
         <binding name="item">
           <lookup name="item">GtkListItem</lookup>
         </binding>
@@ -381,9 +369,6 @@
   <template class="GtkListItem">
     <property name="child">
       <object class="GtkFileChooserCell" id="file_chooser_cell">
-        <binding name="position">
-          <lookup name="position">GtkListItem</lookup>
-        </binding>
         <binding name="item">
           <lookup name="item">GtkListItem</lookup>
         </binding>
@@ -693,9 +678,6 @@
   <template class="GtkListItem">
     <property name="child">
       <object class="GtkFileChooserCell">
-        <binding name="position">
-          <lookup name="position">GtkListItem</lookup>
-        </binding>
         <binding name="item">
           <lookup name="item">GtkListItem</lookup>
         </binding>
-- 
2.30.2